Merge "Define GIDs for internal media file types." am: 4b44753085 am: 33d1ec216b am: ff2b9311f2
am: 0289e5d74f

Change-Id: I8e99fb2034a8b7d945a3c1d31a47039323c9b3ee