Merge "libcore.java.security: delete KeyStoreTest"