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

Change-Id: I96b1b1356b2789ae2456b929766d83170c242603