Sort includes to stabilize include order w.r.t. clang-format

The clang-format tool sorts `#include` lines within contiguous blocks.
Separate blocks with blank lines and sort the include lines within them
so that clang-format does not re-order anything.

Change-Id: I96d6828f470b9a234464972172d46afab322487c