Merge "Update the SDK version of Scrypt"