Merge Android and iOS

Also removed files not needed so make the filesize smaller for
Blackberry.