Update makefiles after merge of Chromium at 260927

This commit was generated by merge_from_chromium.py.

Change-Id: Ib9ef722bb6b8b219845a4fb2a89f159176347d96
8 files changed