Reverting a couple of commits
https://github.com/upndwn4par/android_packages_apps_ThemeChooser/commit/37e6bff65278037305b122430f439124ba3550af
https://github.com/upndwn4par/android_packages_apps_ThemeChooser/commit/6d8f5fdc9f0bf1358617b840f86d16375382e70b