Merge "Replace OUT with OUT_DIR" into oc-mr1-dev-plus-aosp