Android N MR2 Preview 2
Merge "Export headers from libgif"
am: 7b83ab3690

Change-Id: I5757c104e8c902433ba4371f5f7b3cc32ced34be