Update makefiles after merge of Chromium at r161108

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

Change-Id: I8919cdef32eaff61932ad79483e5834485e1944b
1 file changed