[style] re-order x.h and x-inl.h to please IWYU

IWYU explicitly prefer x.h to precede x-inl.h in the ordering
of include files.  This patch updated few files to adhere to
IWYU's preference, unifying the order of such include file pairs
across the codebase.

This patch doesn't contain any functional modifications.

Change-Id: I697416766610d169f1e13450310fd218c197b439
Reviewed-on: http://gerrit.cloudera.org:8080/14844
Reviewed-by: Adar Dembo <adar@cloudera.com>
Tested-by: Kudu Jenkins
5 files changed