fix the mac build

Change-Id: I58ba010150da6ccc062722b975afde0f12b68fc5
Signed-off-by: Roman Birg <roman@cyngn.com>
Merge remote-tracking branch 'CyanogenMod/cm-11.0' into cm-11.0