Update makefiles after merge of Chromium at r220875

This commit was generated by merge_from_chromium.py.

Change-Id: I56909da495dec24dbbd3bf53d76e85171a1894b6
12 files changed