Update makefiles after merge of Chromium at 457b0a1c9412

This commit was generated by merge_from_chromium.py.

Change-Id: I680f46e46dd624ff41c4233a942c21b2aa751c92
2 files changed