Update makefiles after merge of Chromium at r187434

This commit was generated by merge_from_chromium.py.

Change-Id: I7eaeeef02086f4e76a4b384dc0763ae4a4b77e9c
4 files changed