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

Change-Id: Iefbe21c6d0426ae6dd67e2deb0826383d630eedc