Update makefiles after merge of Chromium at 6e9c84566c9f

This commit was generated by merge_from_chromium.py.

Change-Id: I428ef84cb5b38e50b9ad568dac26bff9874793fc
10 files changed