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

Change-Id: Idbc4dbf3a9fbc7e1cbc865355d9c67550b14e8b5