Merge "Convert java hwbinder mk -> bp." am: 53c945fb71 am: 7bebf15460 am: e215488334
am: ae1d9692e1

Change-Id: Ice41676c739aa9df308cf68dab652913195307d5