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

Change-Id: Ia4012e69366a69011e3e511c78db8146d6504c0e