Merge "Fix aapt2 build break on MacOS" into main