Merge "Avoid particular includes in NDK" am: 36c34d8871

Original change: https://android-review.googlesource.com/c/platform/external/icu/+/1477256

Change-Id: I90195a0bb1a87f51edcd50a51f8eb21e25c3866d