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

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