Merge "Use -Werror in external/freetype"