Merge "Add missing libraries for clang-format. am: b46f318d30 am: 57411eecda am: 1cff43dcee am: 60e91c9376" into p9.0