add android to build
style fixes