Build fixup
Merge branch 'cm11' of https://github.com/olokos/Apollo into cm11
Fixed github