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

Change-Id: I0eddfe7f22364db760e0635221dab6985e9ee351