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

Change-Id: Ie342b3e24b919d174171b9ba5121801cd96031a7