Update makefiles after merge of Chromium at 9c6ac85c45fa

This commit was generated by merge_from_chromium.py.

Change-Id: Ie15c4032bbeb5c813bc2964b2ece21e47526d486
10 files changed