Merge "Broke out build script into variability.. Added support to build either in...