Update makefiles after merge of Chromium at r187717

This commit was generated by merge_from_chromium.py.

Change-Id: I59a694d84d8194b19adbfff988c443c76327b650
4 files changed