Merge "Move <uses-sdk> before <application> in samples."