Merge "Remove unnecessary use of external/icu/icu4c/source/common" into stage-aosp-master