Update makefiles after merge of Chromium at d0b993bb2548

This commit was generated by merge_from_chromium.py.

Change-Id: I21761e3ba5e85547179716cc3fe7b691418d64cd
10 files changed