2c13b9d155
Merge commit 'e0cadd7cd811a674df62279dec00d17678b2c501' into eclair-plus-aosp * commit 'e0cadd7cd811a674df62279dec00d17678b2c501': Make perf metrics collection & output via instrumentation simpler