Update makefiles after merge of Chromium at 272566

This commit was generated by merge_from_chromium.py.

Change-Id: Ia33ce1e6c62f473a6757d90ffe5d5f7008e095f8
5 files changed