Merge "Revert "Add skip_themes directive to build process"" into gingerbread