Update makefiles after merge of Chromium at 266543

This commit was generated by merge_from_chromium.py.

Change-Id: Ica562301d7e3f169e440dc205532416c7df94c15
2 files changed