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

Change-Id: I7ef749f115b387475bcfc85355f4e41b552b354a