Fix build for static lib and executable

This seems to have been missed in aad1acc

Change-Id: I9973743dbd91dbf29691118a577f2588da8ec403
Merge branch 'cm' into HEAD