Add Android build.
Small fixups.