am 7fa28666: Merge change I502d5a9b into eclair-mr2

Merge commit '7fa286662790bce1687bd4ff25a6735491392b9c' into eclair-mr2-plus-aosp

* commit '7fa286662790bce1687bd4ff25a6735491392b9c':
  construct event-log-tags via the new build mechanism