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