Merge "KeyMaster: support boot,vendor patchlevels"