Merge "keymaster: add flags indicating feature support"