Gardening: Update to latest revision

(so many changes, I hope it's not hard to follow)

Effecting CLS:
https://codereview.chromium.org/184433003
https://codereview.chromium.org/192823002
https://codereview.chromium.org/198333004
https://codereview.chromium.org/188933002
https://codereview.chromium.org/194843004
https://codereview.chromium.org/196063002
https://codereview.chromium.org/196573023
https://codereview.chromium.org/198073003