Merge "BBinder -> BHwBinder." am: fe4d257887 am: 051b14106f am: 24b33094f6
am: 1bc9d241f6

Change-Id: I872c4f18f1a9c8fa8247f9c2b0f40107c1b51daa