Update makefiles after merge of Chromium at 233627

This commit was generated by merge_from_chromium.py.

Change-Id: Ice2864a861385b77818abcfe16b256a4a01c19ca
6 files changed