Update makefiles after merge of Chromium at fb34b348eead

This commit was generated by merge_from_chromium.py.

Change-Id: I9574eeced5bbd7ab76321b5de59d2b052814ba75
10 files changed