am 95e1382b: Refactor AesKey, extracting most functionality to SymmetricKey.

* commit '95e1382b75bab7d8b4cce3c1267fa23df2006957':
  Refactor AesKey, extracting most functionality to SymmetricKey.