Merge "Allow host self-references in external/icu/..."