Update makefiles after merge of Chromium at 279716

This commit was generated by merge_from_chromium.py.

Change-Id: I3ac0b901144d493a9efd5a02d75e6cf660cbf579
10 files changed