Merge "MtpClient: Fix problem with getDeviceList() returning empty result in some cases" into honeycomb-mr1