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

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