Merge "Remove unused non-java files under ojluni/src/main/java."