Update makefiles after merge of Chromium at 227040

This commit was generated by merge_from_chromium.py.

Change-Id: I55a7347d7245807aca750b02e81460395224cc5d
6 files changed