Merge "Convert usb service .mk -> .bp."
am: 16b3e062ce

Change-Id: Ic8011399e470a1c62156c656a0ea1987ed999382