Update makefiles after merge of Chromium at 866abeb12e42

This commit was generated by merge_from_chromium.py.

Change-Id: Iae5e6a0e3fe749177b2459ffe5c9e48b0254f7be
20 files changed