Update makefiles after merge of Chromium at r188769

This commit was generated by merge_from_chromium.py.

Change-Id: I7e0d351d2851f5f6d96699a80ce1c46d677e4ea2
2 files changed