Merge "keymaster: add flags for keymaster features"