Merge "Keymaster 4.1 VTS tests" am: 75629017d2 am: 56b8c4ede6

Change-Id: I7a3197d977e52756e83e6a5f556941d69fed8d7d