am 6c4a70c6: Merge change I672b05c4 into eclair-mr2

Merge commit '6c4a70c64d45545814ba60ad8ad3a95474ea0944' into eclair-mr2-plus-aosp

* commit '6c4a70c64d45545814ba60ad8ad3a95474ea0944':
  make build depend on event-log-tags file