Fixing sample project and updating gradle build for both library and sample project