Update makefiles after merge of Chromium at a301aef21f9e

This commit was generated by merge_from_chromium.py.

Change-Id: I31206ce3409533d573a854a6d3f39bc53e1235a7
10 files changed