Update makefiles after merge of Chromium at 82ca3b654cda This commit was generated by merge_from_chromium.py. Change-Id: I8403a2dac68f07cd7c5a9a938f91099996eaf544