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

Change-Id: I23bb2ee30a71dc677489219dbb817d6e771f76e6


Trivial merge