Merge "Add Sv2 to aapt2 codenames" into sc-v2-dev