Merge "Add flag indicating gpu support in emulator system image."