Untangle and clean up the logging code

It was a mess before because of a combination of having code split out
for cRIO vs Linux and cruft.

Change-Id: Id282e1a7f7988be0441c669a573a5d022ed41fb9
diff --git a/aos/build/queues/compiler.rb b/aos/build/queues/compiler.rb
index 1f739e0..0b60b0e 100644
--- a/aos/build/queues/compiler.rb
+++ b/aos/build/queues/compiler.rb
@@ -107,7 +107,7 @@
   cpp_tree.add_cc_include("<inttypes.h>")
   cpp_tree.add_cc_include("aos/common/queue_types.h".inspect)
   cpp_tree.add_cc_include("aos/common/once.h".inspect)
-  cpp_tree.add_cc_include("aos/common/logging/logging_printf_formats.h".inspect)
+  cpp_tree.add_cc_include("aos/common/logging/printf_formats.h".inspect)
   cpp_tree.add_cc_using("::aos::to_network")
   cpp_tree.add_cc_using("::aos::to_host")
 
diff --git a/aos/build/queues/print_field.rb b/aos/build/queues/print_field.rb
index 4f0fe7d..5eb3712 100644
--- a/aos/build/queues/print_field.rb
+++ b/aos/build/queues/print_field.rb
@@ -17,7 +17,7 @@
 #include "aos/common/byteorder.h"
 #include "aos/common/time.h"
 #include "aos/common/print_field_helpers.h"
-#include "aos/common/logging/logging_printf_formats.h"
+#include "aos/common/logging/printf_formats.h"
 
 namespace aos {