Merge "CipherTest: Remove unused AES_MODES"