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

Change-Id: I9adc9541548428b46db1d1ae0059f5a9dc660450