Update makefiles after merge of Chromium at 260152

This commit was generated by merge_from_chromium.py.

Change-Id: Ie5c0d85d441e6308ab3750243c037da72cad352c
8 files changed