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

Change-Id: I4cdc4940c022dc8e60520ce23a9e447d763f0c2d


Trivial merge