Merge "Remove old library JARs when upgrading" into stable-2.6