Update makefiles after merge of Chromium at 2d0da5605d75

This commit was generated by merge_from_chromium.py.

Change-Id: Ida832a6e55751c62a2cec4e91b78f0feafde5230
2 files changed