Improve benchmarks and exclude from distro

Change-Id: If70fa19418ccfd339695997944ac34350742319a
4 files changed