Update makefiles after merge of Chromium at 271215

This commit was generated by merge_from_chromium.py.

Change-Id: Iac8246595af05d6ccefdcc275772046e97cf3715
4 files changed