remove redundant reset_between_scenarios, bump Calabash Android version