Android O IOT Preview 6 (4475743)
Merge "Use -Werror in external/libpng"
am: de8ed1e343

Change-Id: I3a1bb650da85b33d278847d1b6c2314258f9e1ff