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

Change-Id: Id279641092ad7585d4c250d407907144f5ef850f