Merge "Broke out build script into variability.. Added support to build either in...
authorErich Keane <erich.keane@intel.com>
Wed, 8 Oct 2014 18:33:24 +0000 (11:33 -0700)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Wed, 8 Oct 2014 18:33:24 +0000 (11:33 -0700)

Trivial merge