Update makefiles after merge of Chromium at 260927

This commit was generated by merge_from_chromium.py.

Change-Id: I5ca1ed0a2655e240988770b0f09e7b1b9b9bf276
8 files changed