Merging ios and android into parent repo