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

Change-Id: I6d588f874ea66cdfa372292aee1ee7d0809a1a3f