am c825d3e: fix the sim build.  disables the tests for now.

Merge commit 'c825d3ebd6ca66e65e63fdc76f032e08aa2a8e22'

* commit 'c825d3ebd6ca66e65e63fdc76f032e08aa2a8e22':
  fix the sim build.  disables the tests for now.