Merge "Replace OUT with OUT_DIR" into oc-mr1-dev-plus-aosp
am: c5e9040444  -s ours

Change-Id: I941ea6d2000d000256b1625938ef37f20a4fae69