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

* commit '23e97f5da43f6b8d53b79fe4014a6078dfc7c510':
  Support compiling run-tests with jack