Merge "goldfish: let usbmanager starts adbd"