DO NOT MERGE ANYWHERE Emulator: bump Google ATV SDK revision to 3
am: 6967ab1e7b  -s ours

Change-Id: Id2d3034b670cf2cc27e21bcfb8ad6834cc86ad0f