am c9ac3f51: Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread

* commit 'c9ac3f5183be3f124f34ed49ac5766e0ba1aff77':
  DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect