Merge "Add Keymaster VTS tests for some AES cases:" am: 772fb53999
am: 0baa38ed55

Change-Id: I6515f4b505bf58cb17d32e09ee2f0ce3cc98e9c1