Merge "Add <uses-library> information."