Update makefiles after merge of Chromium at fb34b348eead

This commit was generated by merge_from_chromium.py.

Change-Id: I4474e5cfe82a391ede97f98cd8af81e12a76cba3
10 files changed