Merge "Make vm-tests push jars to a writable directory." into froyo