Update makefiles after merge of Chromium at 39.0.2171.95

This commit was generated by merge_from_chromium.py.

Change-Id: I82d4c3ea3a5c5d52044c8fbfbb95db3c55eb7c58
2 files changed