Merge "Update AAPT for S V2." into sc-v2-dev