Merge changes I26394509,I9d76a0ec,I88779273 into main

* changes:
  keystore2: link to android.security flags library
  keystore2: log super key creation
  keystore2: factor out create_super_key()