Revert "endeavoru: build correctly on OS X"

This reverts commit 5e9f20f7ec3ba969dca1453a2981164e34ce0a09.

Change-Id: I52d03d251f4c64f85afd1f1cbc9a218c37746f90
Merge "Revert "endeavoru: build correctly on OS X"" into cm-11.0