Merge "Add support for library names."