Cleanup cx.eventlogging.js

Change-Id: I8b68b9701a560a6ff9fa6347173cfa9e2567e6ee
Merge "Cleanup cx.eventlogging.js"