Merge "Make run-{libcore,jdwp}-tests work with OUT_DIR set."