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