Merge "Replace clang-format with symlink." am: 1cd12c820c
am: 3114ed70e0

Change-Id: I7c5f9cbd04a27a1696cfeda0902c6bb0c8ec4200