DO NOT MERGE ANYWHERE Emulator: bump ATV revision to 2 for next preview release
am: 7b25e32e18  -s ours

Change-Id: I688ea39dae5ef758c47ddfe0b11153fa1134d332