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