Update makefiles after merge of Chromium at r188317

This commit was generated by merge_from_chromium.py.

Change-Id: I4a105e3825009a5f7ad049d734b3db5b041f5dea
2 files changed