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

* commit '7643dcbd15f2c37454fc5cabf8e3eda32a66a320':
  Emulator: reset revision to 1 for N SDK system images