merge from open-source master

Change-Id: I3d24628d38c99369f242733d9089d7c5669a4623

diff --cc core/main.mk
Simple merge

diff --cc target/product/AndroidProducts.mk
index 2774968,e241cde..be874c6
--- 1/target/product/AndroidProducts.mk
--- 2/target/product/AndroidProducts.mk
+++ b/target/product/AndroidProducts.mk
@@@ -26,8 -26,9 +26,9 @@@
  #
  
  PRODUCT_MAKEFILES := \
 +    $(LOCAL_DIR)/core.mk \
      $(LOCAL_DIR)/generic.mk \
 -    $(LOCAL_DIR)/min_dev.mk \
 -    $(LOCAL_DIR)/sdk.mk \
 -    $(LOCAL_DIR)/sim.mk \
+     $(LOCAL_DIR)/generic_x86.mk \
 -    $(LOCAL_DIR)/generic_with_google.mk
 +    $(LOCAL_DIR)/full.mk \
 +    $(LOCAL_DIR)/sdk.mk \
 +    $(LOCAL_DIR)/sim.mk