Merge "Add Keymaster4.1 definitions." am: 09b2f93ab9 am: bf3974f323 am: 7dcc835097

Change-Id: I99eded133e22ce7235d85a8ccb24c903b29c9c3e