resolved conflicts for merge of 162991be to gingerbread-plus-aosp

LOCAL_BUILT_MODULE := $(built_module_path)/$(LOCAL_BUILT_MODULE_STEM)

built_module_path :=

# LOCAL_UNINSTALLABLE_MODULE is only allowed to be used by the

# internal STATIC_LIBRARIES build files.

LOCAL_UNINSTALLABLE_MODULE := $(strip $(LOCAL_UNINSTALLABLE_MODULE))

ifdef LOCAL_UNINSTALLABLE_MODULE

  ifeq (,$(filter $(LOCAL_MODULE_CLASS),JAVA_LIBRARIES STATIC_LIBRARIES))

    $(error $(LOCAL_PATH): Illegal use of LOCAL_UNINSTALLABLE_MODULE)

  endif

else

ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))

  LOCAL_INSTALLED_MODULE := $(LOCAL_MODULE_PATH)/$(LOCAL_INSTALLED_MODULE_STEM)

endif