Revert "ThemeChooser : Allow users to pass aapt check"

This reverts commit 7af9c5d67ad56bcb46b8e6f8e0cba1c9549c1df5.