Merge "Convert usb service .mk -> .bp."
authorTreehugger Robot <treehugger-gerrit@google.com>
Thu, 5 Oct 2017 17:33:49 +0000 (17:33 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 5 Oct 2017 17:33:49 +0000 (17:33 +0000)

Trivial merge