waf: use methods from bld instead of ardupilotwaf for the remaining

Tools/CPUInfo/wscript

@@ -1,11 +1,8 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import ardupilotwaf
-
 def build(bld):
-    ardupilotwaf.ap_program(
+    bld.ap_program(
-        bld,
         use='ap',
         blddestdir='tools',
     )

Tools/Replay/wscript

@@ -1,11 +1,8 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import ardupilotwaf
-
 def build(bld):
-    ardupilotwaf.ap_program(
+    bld.ap_program(
-        bld,
         use='ap',
         blddestdir='tools',
     )

libraries/AP_HAL_Linux/benchmarks/wscript

@@ -1,10 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import ardupilotwaf
-
 def build(bld):
-    ardupilotwaf.find_benchmarks(
+    bld.find_benchmarks(
-        bld,
         use='ap',
     )

libraries/AP_Math/benchmarks/wscript

@@ -1,10 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import ardupilotwaf
-
 def build(bld):
-    ardupilotwaf.find_benchmarks(
+    bld.find_benchmarks(
-        bld,
         use='ap',
     )

libraries/AP_Math/tests/wscript

@@ -1,10 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import ardupilotwaf
-
 def build(bld):
-    ardupilotwaf.find_tests(
+    bld.find_tests(
-        bld,
         use='ap',
     )