Update makefiles after merge of Chromium at 266543

This commit was generated by merge_from_chromium.py.

Change-Id: Ide4ff396a8a8d54f7d04dc99de5524806d71e89f
2 files changed