am 1fe58202: am ea65c191: Merge "libctest: zap"
am 1fe58202: am ea65c191: Merge "libctest: zap"

* commit '1fe582026940c70f4a7ff8f130372234d07d3611':
  libctest: zap

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build