Update makefiles after merge of Chromium at a301aef21f9e

This commit was generated by merge_from_chromium.py.

Change-Id: Id021bc72b59a5693136a00def584e44f7266a37a
10 files changed