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

Change-Id: Iccb71732e3812f5257a12d135dec977a29a09883