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

Change-Id: Ia799ca49151cdb20b6327d814f65822b46d8fb45