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

Change-Id: Ie421827cb7dd5d9f3b9e3cc25695b4227fd9e3e8