Merge "Fix dependencies when not building with Jack."
am: a643cfd2b6

* commit 'a643cfd2b68135b9a052daa776fa00710c4c2ff4':
  Fix dependencies when not building with Jack.