Correct indentation of Java API Ant build.xml script
Remove legacy unusued commutative-pair.h file from C++ library