Update makefiles after merge of Chromium at 261622

This commit was generated by merge_from_chromium.py.

Change-Id: I0f73b1dc4c5c0b33712fc9a6ba2f06af6bd7d7e1
8 files changed