Merge pull request #7054 from JosJuice/android-no-themes Don't include the Themes directory in Android APKs
