resolved conflicts for merge of 34cb6460 to master

Change-Id: I46982ef15b479e55b5cdf2f446577fbaa1356cea

diff --cc target/product/core_tiny.mk
index 2707490,02140af..2e84ed6
--- 1/target/product/core_tiny.mk
--- 2/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@@ -89,9 -91,6 +89,7 @@@ PRODUCT_RUNTIMES := runtime_libdvm_defa
  PRODUCT_PROPERTY_OVERRIDES += \
      ro.carrier=unknown
  
- MINIMAL_FONT_FOOTPRINT := true
- 
 +$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)
  $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
  
  # Overrides