[SIMULATOR] Android almost done and corrections in iOS
[SIMULATOR] Android almost done and corrections in iOS