Merge "Use -Werror in external/javasqlite"