Merge "hikey960: Switch to bootcontrol 1.2" am: 498610c467 am: e788a0fd21

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/2133814

Change-Id: I2ef1e299b86ba0bacd8159a85fef5e2d1b186955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/device-common.mk b/device-common.mk
index 3833ca1..e0df5a4 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -91,8 +91,7 @@
 PRODUCT_RUNTIMES := runtime_libart_default
 
 # Build default bluetooth a2dp and usb audio HALs
-PRODUCT_PACKAGES += audio.a2dp.default \
-		    audio.bluetooth.default \
+PRODUCT_PACKAGES += audio.bluetooth.default \
 		    audio.usb.default \
 		    audio.r_submix.default \
 		    tinyplay