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

Change-Id: Iefbe21c6d0426ae6dd67e2deb0826383d630eedc


Trivial merge