Merge "DO NOT MERGE ANYWHERE Emulator: bump Google ATV SDK revision to 3 am: 6967ab1e7b  -s ours am: c9e09b117d  -s ours am: b99545f86a  -s ours" into nyc-mr2-dev-plus-aosp