Merge "ginstall: Add support for Android images"