Merge "Minor cleanup in nanobench" into master-skia

https://skia.googlesource.com/skia/+/75a0ebb0d0bd852e3b068bf14370c6689242a89c

Change-Id: Iad4f0104653070baf704efe4a4be35b343382e13