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

Change-Id: Ifc11c0bae4a8d8f15427e79c4a50ee3009d5d477