Merge "AAPT: Only print last uses-sdk tag" into sc-dev