Update makefiles after merge of Chromium at r188317

This commit was generated by merge_from_chromium.py.

Change-Id: I273384565ff235cf5f38b37fa3b854d5ca9c4ce3
12 files changed