Merge "Add aapt to aapt2_artifacts" into sc-dev