Update makefiles after merge of Chromium at 266543

This commit was generated by merge_from_chromium.py.

Change-Id: Ib0b21910e1c476abdbecd16c5e9681edb0217891
2 files changed