Merge changes I2b7ca81b,I8308b23d,I33074bfe

* changes:
  Add rileyspahn@'s keymaster enforcement code.
  Implement AddRngEntropy.
  Add AAD support to AES OCB.