Update makefiles after merge of Chromium at 39.0.2171.95

This commit was generated by merge_from_chromium.py.

Change-Id: I20f67f779e82dbccd275319b0182d707408340bf
2 files changed