Merge "combine adbd.rc with init.usb.rc"