Merge "Use -Werror in external/sqlite/dist"