Update makefiles after merge of Chromium at a301aef21f9e

This commit was generated by merge_from_chromium.py.

Change-Id: Ibc857eefd77cf71c5ab829bad394a1b6a94fc243
10 files changed