A four-story apartment building with affordable housing and ground-floor commercial space has been added to Ann Arbor riverfront redevelopment plans.