am ecab0379: Merge "Remove useless TestRunner for KeyStoreTests"

* commit 'ecab03799b34108924b88183d9bde14329691fbb':
  Remove useless TestRunner for KeyStoreTests