Merge "libhwbinder test: Android.mk -> Android.bp"