Update makefiles after merge of Chromium at 268710

This commit was generated by merge_from_chromium.py.

Change-Id: I8ceb035a91083a340578d5f3a800eecad41a4e46
10 files changed