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

Change-Id: I6a203b224c83a001723be336f939137ce7bcd52f