Merge "Add hashes for Keymaster 4.1"