am e2ba6f72: am ecab0379: Merge "Remove useless TestRunner for KeyStoreTests"

* commit 'e2ba6f72dc7f4ffa6323dfd5338de29bbd8fa35f':
  Remove useless TestRunner for KeyStoreTests