Merge "[aapt2] Fix and optimize tracing" into main