This was done only to avoid symbol vbaeventshelper::serviceDecl which
is duplicated in sw.

Change-Id: I3cbeeee9d64765685223bbc53ced551876a717ae