Update makefiles after merge of Chromium at 227040

This commit was generated by merge_from_chromium.py.

Change-Id: I07cfc0aae14c62909e217c3d142b2772adde65b0
6 files changed