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

Change-Id: I202bf83265fc0225f54d49e7b2a7de28c921100b