Update makefiles after merge of Chromium at 39.0.2171.95

This commit was generated by merge_from_chromium.py.

Change-Id: I35d237dc7b3a0f43435bbff5a0ae9dac3d197059
2 files changed