Update makefiles after merge of Chromium at 245864

This commit was generated by merge_from_chromium.py.

Change-Id: I774fc6b2403651a1979e20c957a0c9b0fce9d4e1
6 files changed