Merge "Remove incremental workaround for aapt overlays"