Fix build problems due to https://github.com/mesos/spark/pull/838