Merge "Fix build, GsmServiceStateTracker was using old EventLog API."