Merge "ICrypto: remove binder inheritance"