am bee96cc2: am bb86cc8c: Merge "Simpleperf: refactor dso."

* commit 'bee96cc2d96d574dc7322beeb4ff2ced61c6be8d':
  Simpleperf: refactor dso.