Merge "AAPT2: Fix <add-resource> tag for overlays" into oc-dev