Update makefiles after merge of Chromium at r194922

This commit was generated by merge_from_chromium.py.

Change-Id: Id93a5424cb1f13693ddc8e8e7124cdb4bd05f52e
2 files changed