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

* commit '765cbbe74ff74c743f556e7ff67e6c7bef02363a':
  Fixing the build for real.