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

Change-Id: Ibaebc42be2d02322984ee205342e6b848a9d73bb