am: 5a020161 -s ours * commit '5a020161': DO NOT MERGE CipherTest: add test for multiple updateAAD calls Change-Id: I59a028d5d69784553b9371b38eff2cbbeea8eb50