Merge "keymaster_defs: Add missing tags added in KM 4.1 and earlier."