Merge "Move clang-formats to build."
am: 66853db0a2

Change-Id: I005a7e056c9050ec927f59a7f195ddc3f7d39773