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

* commit 'ff61da9b3afbcd4df7e40d97c5537ff3afa592c8':
  Remove useless TestRunner for KeyStoreTests