Move to libdroid model service client