Merge "libhwbinder test: Android.mk -> Android.bp" am: 154040c0ca am: e7d4e66030
am: ce443e0b23

Change-Id: I2b63cd362403db78159f05f5dbf4a13d7a0d7d79