Merge "AAPT2: Add support for overlays when merging resources"