Update makefiles after merge of Chromium at 5a645aa13b82

This commit was generated by merge_from_chromium.py.

Change-Id: Ie60844c92351b08f08df1bfababef624d67e9b19
12 files changed