am 67c7510f: am f776b18f: Merge "Add more CipherTest tests"

* commit '67c7510f9ca84347ec029023b3f04832f4453b9f':
  Add more CipherTest tests