am 2ad03d0c: am c1aebfa0: Merge "Clean up USB Manager and fix ADB." into mnc-dev

* commit '2ad03d0c3275c902d6c86dcef8f4bd91183d397f':
  Clean up USB Manager and fix ADB.