Update makefiles after merge of Chromium at 227040

This commit was generated by merge_from_chromium.py.

Change-Id: If1a1cda1aa2362dcac832c35d65602f9dba86e40
6 files changed