DO NOT MERGE ANYWHERE Emulator: bump Google ATV SDK revision to 3 am: 6967ab1e7b...
bohu [Wed, 7 Dec 2016 16:02:46 +0000 (16:02 +0000)]
am: f5736fd45e  -s ours

Change-Id: I42977ef3558d2d1bdf4c639a25eeead0423e1461


Trivial merge