Merge "Remove aapt2_results." into main