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

Change-Id: I8a01073bafd8d6fdabaee2a6fbe24f93fa227f0c