Merge change Iab5c49c7 into eclair-mr2

* changes:
  move event log tags used by system server into this package