Revert "fix the mac build"

Alas, April 1st is nearly done. Baaaaaah

This reverts commit 43299c39a8f4f055b23dc7bb9827eebe29da15df.

Change-Id: I600a576de1a751a31a7b32165eb011b37b83e505
Merge "Revert "fix the mac build"" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into HEAD