Update makefiles after merge of Chromium at r187717

This commit was generated by merge_from_chromium.py.

Change-Id: I482506557485dff5e9b3bf44b9139ab315f6772f
4 files changed