Merge "emulator: bump revision of sdk system images to 3" into nyc-dev