Update makefiles after merge of Chromium at r187292

This commit was generated by merge_from_chromium.py.

Change-Id: I239c00ce1f4f867c8b28aa0c69fcbc7866845720
4 files changed