Update makefiles after merge of Chromium at 2d0da5605d75

This commit was generated by merge_from_chromium.py.

Change-Id: I2c6a2e16a048351e410f6d535cbb7ae6964deeef
2 files changed