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

Change-Id: I69adcd9a58e973d326c94beb759ac696c4ec70d1