Update makefiles after merge of Chromium at 265680

This commit was generated by merge_from_chromium.py.

Change-Id: Ic55ecac3bc2c50f2c6acd74879b9dfec23da0442
8 files changed