Replace OUT with OUT_DIR am: 30423888e6 am: b12c791bec  -s ours
am: 0391f7d2d2  -s ours

Change-Id: Iebfc0b9214f82acdfb4e46682bc7145388beba3a