Merge "libhardware_legacy: remove dead code in Android.mk"