patches: Track upstream changes

Effecting CL: https://codereview.chromium.org/24710002