Merge pull request #10495 from alalek:cmake_java