Merge "New tests for AndroidHttpClient with a proxy server."