Added Android packages to the image handling