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

Change-Id: I7b23a4a39ad18068ed9c46615b734ace0cb4ce0a