Various cleanups of issues caught by clang-tidy

Change-Id: I6e79c121e7c9032cf5053dd31971e719fe76f4b6
diff --git a/aos/common/mutex.h b/aos/common/mutex.h
index ca35b10..ce10a08 100644
--- a/aos/common/mutex.h
+++ b/aos/common/mutex.h
@@ -2,8 +2,8 @@
 #define AOS_COMMON_MUTEX_H_
 
 #include "aos/common/macros.h"
-#include "aos/linux_code/ipc_lib/aos_sync.h"
 #include "aos/common/die.h"
+#include "aos/linux_code/ipc_lib/aos_sync.h"
 
 namespace aos {