Merge "Include ICU4C cc_library_headers instead of a directory"
am: 9e736316ec

Change-Id: I085237058652fbc70a1fe881dbf4a92eb09c6270