Merge "Fix generation of R classes for libraries to support any package name."