Merge "Add HOST_CROSS_OS"

diff --cc core/base_rules.mk
Simple merge

diff --cc core/binary.mk
Simple merge

diff --cc core/host_executable.mk
index 5601b01,017522a..bc55ef9
--- 1/core/host_executable.mk
--- 2/core/host_executable.mk
+++ b/core/host_executable.mk
@@@ -1,5 -1,6 +1,6 @@@
 -
 +LOCAL_IS_HOST_MODULE := true
  my_prefix := HOST_
+ LOCAL_HOST_PREFIX :=
  include $(BUILD_SYSTEM)/multilib.mk
  
  ifndef LOCAL_MODULE_HOST_ARCH

diff --cc core/host_executable_internal.mk
Simple merge

diff --cc core/host_shared_library.mk
index 6964cc9,920281c..49000a4
--- 1/core/host_shared_library.mk
--- 2/core/host_shared_library.mk
+++ b/core/host_shared_library.mk
@@@ -1,5 -1,5 +1,6 @@@
 +LOCAL_IS_HOST_MODULE := true
  my_prefix := HOST_
+ LOCAL_HOST_PREFIX :=
  include $(BUILD_SYSTEM)/multilib.mk
  
  ifndef LOCAL_MODULE_HOST_ARCH

diff --cc core/host_shared_library_internal.mk
Simple merge

diff --cc core/host_static_library.mk
index dd7462d,4209b9e..aa8c0e3
--- 1/core/host_static_library.mk
--- 2/core/host_static_library.mk
+++ b/core/host_static_library.mk
@@@ -1,5 -1,5 +1,6 @@@
 +LOCAL_IS_HOST_MODULE := true
  my_prefix := HOST_
+ LOCAL_HOST_PREFIX :=
  include $(BUILD_SYSTEM)/multilib.mk
  
  ifndef LOCAL_MODULE_HOST_ARCH