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

Change-Id: I4781adad935ca77148226e0ed7df5f0b5b953daa