Update makefiles after merge of Chromium at r188769

This commit was generated by merge_from_chromium.py.

Change-Id: Id849405e58dca0fc57ced705d890d5f567ecb8c1
2 files changed