Added support for other android architectures