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

Change-Id: Ia62ece888ed8c847a9a4378b40f8a7ccf36eb134