Merge "Fix the libc/include .clang-format." am: 9354f3e9a9

Change-Id: I496a7f5143d6a12c6df02c6bb6929a395ddad86e