Merge "Remove benchmarks that use non-public APIs"
am: 532f0e34e6

Change-Id: I3e7774910d30b0a946d35861194981fb9e7a1e56