Merge "Clean up USB Manager and fix ADB." into mnc-dev