Update makefiles after merge of Chromium at fb34b348eead

This commit was generated by merge_from_chromium.py.

Change-Id: Ib0295c91c15e61f31e7e34f8fbc97b1cbdf0c441
10 files changed