Update makefiles after merge of Chromium at r160828

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

Change-Id: Ieed707029f42ff40a62383de59d591af60fcbc4a
1 file changed