Merge "Add external_storage gid"
am: 8e4cf5b436

Change-Id: I875dfb09a68457b9144ac5c8583af44b5e6b94f1