Merge change I5f1d2d24 into eclair-mr2

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