Update makefiles after merge of Chromium at 266543

This commit was generated by merge_from_chromium.py.

Change-Id: I93b7cddd47624866a3f0e3e627fc137958bcd078
2 files changed