Merge "Build and package 32/64bit find_java." into studio-1.0-dev