Merge "Revert "emulator: create qemu images for system,vendor""