Merge "soong: Add `aapt_version_code` default" into android-13.0