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

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