Merge "SystemServer: initialize ADB before USB"