Merge "Fix typo in aapt2_results genrule." into main