Merge "Some cleanup for <uses-library> change." into nyc-dev