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

Change-Id: Iad207d2bb36d0ccdf38d0d08a08acff97c7d7afe