am b24b2470: Merge "Really fix the Mac SDK build this time. Doh."

* commit 'b24b247080a89bed65953ed6d49b65c9b5270d18':
  Really fix the Mac SDK build this time. Doh.