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

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