Olympic baseball, softball to return in 2020 as part of new sports package