Update makefiles after merge of Chromium at a301aef21f9e

This commit was generated by merge_from_chromium.py.

Change-Id: Ia94291c8b0064f67f518c58577d443f17cb440af
12 files changed