Update makefiles after merge of Chromium at a99b7ad25d02 This commit was generated by merge_from_chromium.py. Change-Id: If287a1404e15e309d5d047afeb229927133aaa6f