Remove duplicate cpp file includes.
Small modifications to get the Android code to compile.