Merge "Remove useless TestRunner for KeyStoreTests"