Update makefiles after merge of Chromium at r194922

This commit was generated by merge_from_chromium.py.

Change-Id: I412b80eff4d9a45a6e5bd5f2adaa7ded111472d7
2 files changed