redesign android build image (cuts weight by 10GB)