am 12105116: Merge changes I2b7ca81b,I8308b23d,I33074bfe

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