Update makefiles after merge of Chromium at 271215

This commit was generated by merge_from_chromium.py.

Change-Id: I87af8beaf2eefc4c76b54cc88fa3cf80efcf2cbb
4 files changed