Merge "Revert^2 "Add <uses-library> information.""