Merge "Remove stale SYSTEM_ROOT_IMAGE board config for old kernels" am: 59d1eb18e3

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

Change-Id: Ia2395bf9ce9902b8eaa0723e3ea63c7b8db5a167
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 989ce7b..124e078 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -89,8 +89,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