missing file
more C++/Android fixes