Merge "Added new -minv (version) option to find_java" into studio-1.0-dev