Merge "Use -Werror in external/scrypt"