Clean up a bit.
Fix Android build.