am e5fa335b: am 6e045e0a: am e0cadd7c: Merge change Iffbb6e55 into eclair

Merge commit 'e5fa335b0dffbd06385b6de05ae04b2bd2ea277e'

* commit 'e5fa335b0dffbd06385b6de05ae04b2bd2ea277e':
  Make perf metrics collection & output via instrumentation simpler