Clean up more c++ errors

Modify android.c so it compiles under C++.

Change-Id: I6770a46ee1ccfd6e08fb4c92de94a4adc3084fcc