Update makefiles after merge of Chromium at 222742

This commit was generated by merge_from_chromium.py.

Change-Id: I4a6f0d2327e510d022dea4bfe592cf9eef9fc828
12 files changed