Merge "Update clang version used in generate_libandroidicu.py"
am: a7392bd145

Change-Id: I4c36b08ec5e1942791199af563e79f85b0a103ab