am e8b0fcec: Merge "combine adbd.rc with init.usb.rc"

* commit 'e8b0fcecf4a17cf37b5fefbcceef0920788f776e':
  combine adbd.rc with init.usb.rc