Merge "Environment.isExternalStorageRemovable() is false if external storage is emulated" into honeycomb