Fix some compilations issues for WDS_VENDOR_EXTENSION Change-Id: I82898aeb73b1512df85f937e36dfa7c70d57cac9