Update makefiles after merge of Chromium at 277521

This commit was generated by merge_from_chromium.py.

Change-Id: I5e2487610f17d8a9d3ac7705201232981d75caf3
12 files changed