Add android to build and package