Update makefiles after merge of Chromium at 225846

This commit was generated by merge_from_chromium.py.

Change-Id: I0d58d009937d03cae22cc8d2492370306d1a818f
12 files changed