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

Change-Id: I8a8671638b450aa7b85216f18737b36891b7a11b