Update makefiles after merge of Chromium at 278252

This commit was generated by merge_from_chromium.py.

Change-Id: Ic93d0e432473f68ff72b44235e0696b2745ef1a1
12 files changed