resolved conflicts for merge of b6d53f0b to master

Change-Id: Id01809e2a72ca8ba13594621690273fc6f982095

diff --cc core/main.mk
Simple merge

diff --cc target/product/core_tiny.mk
index 2e84ed6,02140af..41508d9
--- 1/target/product/core_tiny.mk
--- 2/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@@ -20,18 -20,21 +20,12 @@@ PRODUCT_PACKAGES := 
      Bluetooth \
      CertInstaller \
      FusedLocation \
--    InputDevices \
-     bluetooth-health
 -    bluetooth-health \
 -    hostapd \
 -    wpa_supplicant.conf
++    InputDevices
  
  PRODUCT_PACKAGES += \
--    audio \
      clatd \
      clatd.conf \
--    dhcpcd.conf \
--    network \
--    pand \
--    pppd \
-     sdptool
 -    sdptool \
 -    wpa_supplicant
++    pppd
  
  PRODUCT_PACKAGES += \
      audio.primary.default \

diff --cc target/product/generic_no_telephony.mk
index 22589ca,04d6e5f..a62b76c
--- 1/target/product/generic_no_telephony.mk
--- 2/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@@ -24,9 -33,17 +24,8 @@@ PRODUCT_PACKAGES := 
      Music \
      MusicFX \
      OneTimeInitializer \
 -    PrintSpooler \
      Provision \
 -    QuickSearchBox \
 -    Settings \
      SystemUI \
-     bluetooth-health \
 -    TeleService \
 -    CalendarProvider \
      WallpaperCropper
  
  PRODUCT_PACKAGES += \