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