Update makefiles after merge of Chromium at 265680

This commit was generated by merge_from_chromium.py.

Change-Id: I2d8f8ca09ff5194929241247cbabca0107824490
8 files changed