Update makefiles after merge of Chromium at 271215

This commit was generated by merge_from_chromium.py.

Change-Id: Ia1c4fda8244a3a1c195f81f4d84e0e91b47d6987
4 files changed