Update makefiles after merge of Chromium at r178127

This commit was generated by merge_from_chromium.py.

Change-Id: I238ed4b4a60fb1cf23e07f47b1ce085b7f97507e
3 files changed