Merge "Emulator: reset revision to 1 for N SDK system images" into nyc-dev