bug 870370: move EXTRA_COMPONENTS to moz.build (file batch #2). r=mshal