Now compiles cleanly on android.

No warnings
No errors