Change from apklib to jar