Update makefiles after merge of Chromium at 278252

This commit was generated by merge_from_chromium.py.

Change-Id: Ie2636966966867f765f059fb9d4e917d89b92c45
10 files changed