- Fix up C++ Makefile for cross-compilation - Put java depedency jars in correct location in java example zip file