Update makefiles after merge of Chromium at fb34b348eead

This commit was generated by merge_from_chromium.py.

Change-Id: Ic41bffd993445664617b532aa64983365e0df06c
12 files changed