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

Change-Id: I67e51f5ed0301a6303a1f59f154f5bf3f60114f8