Update makefiles after merge of Chromium at 280798

This commit was generated by merge_from_chromium.py.

Change-Id: I4e0521ac15eff30eee9685ce695640c93e96a764
10 files changed