Merge "Fix OUT_DIR usage"
am: b2a6d1218c

Change-Id: I18bb328857303e74e236a88621f3ca2e983d5381