am c25cfc57: am 24d02652: Merge "Prevent EntropyMixer from registering with service manager."

* commit 'c25cfc57e0d863b002620f5e7dd14822418c678f':
  Prevent EntropyMixer from registering with service manager.