move lib to libs for android adt expectations, also random build cruft