fix the mac build

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