Update makefiles after merge of Chromium at r161108

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

Change-Id: I7f608d700472eb6d08dcf13e65bf6a5af4e3807f
1 file changed