am a4c1b0a7: Merge "Fixing the build for real." into jb-dev

* commit 'a4c1b0a7ca48c0b9fcc0a4af393faf64d0a16b91':
  Fixing the build for real.