More work cleaning up the BUILD files

Change-Id: I47fb18e7a12cd7e081631a5369274ef1e25f22c4
diff --git a/aos/common/controls/BUILD b/aos/common/controls/BUILD
index c021714..6c0805c 100644
--- a/aos/common/controls/BUILD
+++ b/aos/common/controls/BUILD
@@ -24,7 +24,7 @@
   deps = [
     '//aos/common:time',
     '//aos/common/messages:robot_state',
-    '//third_party/gtest',
+    '//aos/testing:googletest',
     '//aos/common:queue_testutils',
   ],
 )
@@ -33,7 +33,7 @@
   name = 'polytope',
   deps = [
     '//third_party/eigen',
-    '//third_party/libcdd',
+    '//third_party/cddlib',
   ],
 )
 
diff --git a/aos/common/controls/polytope.h b/aos/common/controls/polytope.h
index e37346e..1ca1ec6 100644
--- a/aos/common/controls/polytope.h
+++ b/aos/common/controls/polytope.h
@@ -2,8 +2,13 @@
 #define AOS_COMMON_CONTROLS_POLYTOPE_H_
 
 #include "Eigen/Dense"
+#ifdef AOS_BAZEL
+#include "third_party/cddlib/lib-src/setoper.h"
+#include "third_party/cddlib/lib-src/cdd.h"
+#else
 #include "libcdd-094g-prefix/include/setoper.h"
 #include "libcdd-094g-prefix/include/cdd.h"
+#endif
 
 namespace aos {
 namespace controls {