Partial revert of "Make all scripts OUT_DIR_COMMON_BASE gnostic"

Change-Id: Ibeb11424d56899f157c96c25d0300bbe354664f9