Merge "Make run-test --jvm set DEX_LOCATION"