Update makefiles after merge of Chromium at r220875

This commit was generated by merge_from_chromium.py.

Change-Id: I8a0e80bcc62e002855a6b9ef32d9b772cbb82964
6 files changed