Merge "hikey960: enable the bootcontrol hal for hikey960 build" am: a6b96db0e7 am: 6709139ada

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

Change-Id: I0b3256a26392e116867b4f73ad1cbdd6142c76fe
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 dea852c..bd5c06a 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