Update makefiles after merge of Chromium at 39.0.2171.95

This commit was generated by merge_from_chromium.py.

Change-Id: I13b75659a094b17b5591a6ea7f5e10cb1a9f3d7f
2 files changed