Update makefiles after merge of Chromium at 2d0da5605d75

This commit was generated by merge_from_chromium.py.

Change-Id: I758313ab8122cbc3f9031182eae5c57e2da48970
2 files changed