Add missing libraries for clang-format. am: b46f318d30
am: 57411eecda

Change-Id: I607bdcbc851bca2814a50b00cdf84375510735b2