am e23639e0: am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2

* commit 'e23639e0386735df50ad208078f638c38f662d42':
  MTP: Have GetStorageInfo command return correct storage type for removable storage