Removed some lib jars and added them as BuildConfig dependencies