Merge "Update GIFLIB to 5.1.4 DO NOT MERGE" into mnc-dev am: 279e33d754 am: 54f3d6fe60 am: 60adcd261e
am: db32fc7024  -s ours

Change-Id: I7d5bbdb3dbfbf7da5922a702323ca6ed1c1e9475