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

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