Update makefiles after merge of Chromium at r160828

This commit was generated by merge-from-chromium.py.

Change-Id: I3fed125a5c04e50d2c09356d5fea753737847be2
1 file changed