Merge "Keystore 2.0: Add super encryption infrastructure."