Merge "Update build for test hal: libhwbinder"
am: 754d21772a

Change-Id: Icb1160fbd5798b31816169d908ebe2d35d9b2e28