Merge "rkp: add keymint v1 hash into rkp v1"