Update makefiles after merge of Chromium at 5a645aa13b82 This commit was generated by merge_from_chromium.py. Change-Id: I13495a64a4921a27fb5adcd0a42eb914408db00a