Update makefiles after merge of Chromium at 282385

This commit was generated by merge_from_chromium.py.

Change-Id: Id1f5f74c0daca27c9856f6d3ffb1e0543083237f
10 files changed