Merge "Move apache specific portions of android.net.http to external/apache-http."