Merge "Change gid bit of /mnt/media_rw to external_storage"
am: 4858f38514

Change-Id: I83cf3d38d056ad3550edf399ae756a44253c062b