Create separate iOS and Android bundles

Change-Id: I09e85fb64868687a40cb3cc9239b28182fbd9686