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