Update makefiles after merge of Chromium at 240663

This commit was generated by merge_from_chromium.py.

Change-Id: I68aaed9bb70b1dc7ab028ec7203c3f31795d675c
12 files changed