DO NOT MERGE ANYWHERE Emulator: bump Google ATV SDK revision to 3
bohu [Wed, 7 Dec 2016 15:50:42 +0000 (15:50 +0000)]
am: 6967ab1e7b  -s ours

Change-Id: Id2d3034b670cf2cc27e21bcfb8ad6834cc86ad0f


Trivial merge