Updating to latest rosjava_build_tools and fixing some catkin build errors