encryptor -> os_crypt

See https://codereview.chromium.org/200713005
Xcode 5.1 also doesn't support -Wno-tautological-pointer-compare