Governor’s prison plan includes expanded county facilities