Merge "Convert usb service .mk -> .bp." am: 16b3e062ce am: de00740271 am: 9a54427e71
am: 7e8a24f2af

Change-Id: Ia9a13bbcc8c1674474b0f24f7efc97245f0f4540