Several changes to component_build

Review URL: https://chromiumcodereview.appspot.com//12220088