Android p preview 5
Merge "Use -Werror in external/giflib" am: 4604b43023 am: 186e796a54
am: 7f7a3d5b8a

Change-Id: If25e7aa4ed8c179b92813b9ef59dd75c9fd63b67