TIMOB-11175 Use XCode defaults for modules, focus only Armv7 for apps.

Backport of Master