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

Change-Id: I13ae82041b4b94a0226aa4506b59f8bbcce971be