Update makefiles after merge of Chromium at a99b7ad25d02

This commit was generated by merge_from_chromium.py.

Change-Id: I1e927b1abe13071f0845450c9206b18041f145a2
10 files changed