Merge "Update build for test hal: libhwbinder"