Merge "Add the new Ant build rules for library projects. Bug: 2294012"