Merge "Add <macro> tag to aapt2" into sc-dev