BC fix: libraries -> library/subLibraries (#3574)
The resulting code is more verbose, but it is more backwards-compatible
and actually is simpler to understand in some cases (because
CLibName uniquely identifies the "public library"; no faffing
about with package names to figure it out.)
Signed-off-by:
Edward Z. Yang <ezyang@cs.stanford.edu>