DO NOT MERGE ANYWHERE Emulator: bump ATV revision to 2 for next preview release am...
bohu [Wed, 23 Nov 2016 22:28:50 +0000 (22:28 +0000)]
am: 7ee3495230  -s ours

Change-Id: I376767a9bf2973b3874e0dbd35661961e45b300d


Trivial merge