Merge "Add --auto-add-overlay option to aapt."