Add support for system-images

This is a small extension to support android system-images.