Update makefiles after merge of Chromium at 268379

This commit was generated by merge_from_chromium.py.

Change-Id: I98fa0407f6a4cf66935aae621786273c74e8323d
6 files changed