am 0f40fbc8: Merge "Support compiling run-tests with jack"

* commit '0f40fbc82722bd75ee04cd7e04580a13a6f79443':
  Support compiling run-tests with jack