Update makefiles after merge of Chromium at 9ef958e74e13

This commit was generated by merge_from_chromium.py.

Change-Id: Iecbf4599f6715051551edb06dca908ddf7da9e26
10 files changed