Merge "Export headers from libgif" am: 7b83ab3690 am: 2692afec5d
am: 782222ab4b

Change-Id: I42e0002037d472a40ee5937aa837ef4f376f6e03