Merge "find_java now locates openjdk as well" into studio-1.0-dev