Merge "Add METADATA to giflib: MIT+Apache2=NOTICE" am: 26799572af

Change-Id: Iec89cb9923138283d86b44bb64eb3a342371e8a5