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

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