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

Change-Id: I2a27e88c21e482b74723d11a4a99375961dc1fe8