Merge "TrustyKeyMint: support boot, vendor patchlevels"