am b0f70423: Merge "Implement keymaster 1.0 add_rng_entropy"

* commit 'b0f70423398a4b161c96c919bf9069610fb4a369':
  Implement keymaster 1.0 add_rng_entropy