Merge "BBinder -> BHwBinder." am: fe4d257887
am: 051b14106f

Change-Id: I148771849faf22aabdcd3861e867913408d84c11