Merge "Run clang-format with netd's .clang-format file."
am: 2295ec5d3a

Change-Id: I25bcc68c089cd26b457f288129f35ac374219e89