Merge "remove android.webkit.HttpDateTime, again"