Merge "Use dex2oat instead of dex2oatd in non-debug run-tests."