fixes for package name and added android-library