Merge "Update clang version used in generate_libandroidicu.py"