Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbread