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

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