Update makefiles after merge of Chromium at 2d0da5605d75 This commit was generated by merge_from_chromium.py. Change-Id: I56c2f89b75749d304631dd8e78a0ad334861bd06