Merge "find_java2: Fix array size calculation"