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

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