Attempt to remove CM_BUILD restrictions, using VANIR_BUILD

Change-Id: I65b82bffd3b04df9d36d334d62ad35a49c882bf5