Show GoogleTV some love
Remove last map remnants so the we can remove any location tracking permission requests.
Merge branch 'DroidconUK2013'