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

Change-Id: I4cdc4940c022dc8e60520ce23a9e447d763f0c2d