am f5e2dc89: Merge "libctest: zap"

* commit 'f5e2dc8967d66362a1d57ce6f764e4585aad9883':
  libctest: zap