Merge "Add the CryptKeeper to the build."