Merge "Use -Werror in external/libpng" am: de8ed1e343
am: adebdf2260

Change-Id: I057959c190514844b57097c5dfa8426ab33a2ab5