Update makefiles after merge of Chromium at r194922

This commit was generated by merge_from_chromium.py.

Change-Id: I5d82a345535a228bca89f52162739d34efd28486
6 files changed