Update makefiles after merge of Chromium at 266543

This commit was generated by merge_from_chromium.py.

Change-Id: I1aa53aa4899e7ed333dc7c5a42b4680ab93f5cfa
2 files changed