Merge "BBinder -> BHwBinder."
am: fe4d257887

Change-Id: Iefe63e614d5c90f33d807aba8fac3f2095972ae8