am 800e8304: am 3bc628b2: am f5e2dc89: Merge "libctest: zap"

* commit '800e8304a5fbc40f7d0156941345635fe4e32555':
  libctest: zap