Merge "Move <uses-library/> inside <application/>"