Merge "libcore/support: change TestKeyStore to avoid using getLocalHost()"