Fixed builds of android-store and ios-store