Merge "Use -Werror in external/expat"