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

Change-Id: Ia514cc6539a1e99d0eceab17027f421ba4c1a96f


Trivial merge