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

Change-Id: I98a22cb381a13df5e64e394ff16e2b2b22f02b0e