Merge "Always pass --auto-add-overlay to aapt2 for aar prebuilts"