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

Change-Id: I79e98ca431190564dc80fd418c03c1dd2c23f99d