fixed oasis.

Removed sublibraries, moved everything to one library.

Change-Id: Ie3d050b5a6135a839b483bbe21db6af66e188f66