Merge "Use -Werror in external/libpng"