Joint iOS build modifications, combining iphoneos and simulator builds

Change-Id: I11a8f814d40f8afd3f1cfcd8a491e70790a27a38
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>