Merge "Remove junit.jar from vmteststf_jar path"