Merge "Fix broken interactions between HTTP response caches and redirects." into dalvik-dev