Gardening: Update to latest revision.
Gardening: Rebase patches.
Fix build.
Gardening: Adopt to https://codereview.chromium.org/527293002/