Merge "Revert "run-test: Ignore OUT_DIR flag""
am: 54163552fe

Change-Id: Ice424b33f84645d7a91b087a87ba163b627f53fc