Fix up master issues with tracing/logging and the compatibility library.

Change-Id: Ia35ca58807a78ea01c4da6c44b4d5e29e65e0cfd
diff --git a/rsCppUtils.cpp b/rsCppUtils.cpp
index 899e7c9..59ec9bb 100644
--- a/rsCppUtils.cpp
+++ b/rsCppUtils.cpp
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-
-
+#include "rsUtils.h"
 #include "rsCppUtils.h"
 
 namespace android {