Update makefiles after merge of Chromium at 244866

This commit was generated by merge_from_chromium.py.

Change-Id: Ibdba49192273233f66c3eb06bfa94f2ffa056c02
6 files changed