Update makefiles after merge of Chromium at b62471bd5180

This commit was generated by merge_from_chromium.py.

Change-Id: I0507980f8080afbf61dc4360c18ed1128e857062
10 files changed