am f6bbe507: am 44c777b6: Switch from KeyStore.delKey/saw to KeyStore.delete/list.

* commit 'f6bbe5074af8316030597b379582f714b0e16d41':
  Switch from KeyStore.delKey/saw to KeyStore.delete/list.