Update makefiles after merge of Chromium at 5a645aa13b82

This commit was generated by merge_from_chromium.py.

Change-Id: Ide25481679da357158153339739538a844e4729d
12 files changed