Merge "Include ICU4C cc_library_headers instead of a directory"