fdo#60698: Merge odbcbase into odbc

We odbcbase is just used inside odbc library, so merge them.

Change-Id: I4f4b34873b570ddcf1065c49e5310a1e73092fd6