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

Change-Id: I7170a1d515f7ce0c4c15c69da46db6f7ce9c005d