Merge "Remove unnecessary use of external/icu/icu4c/source/common" into qt-dev-plus-aosp