Merge "Update Android.bp and vts/Android.mk for Hidl HALs"