Merge "Add a couple of new benchmarks." am: 0ec8bea93c

Change-Id: Ia4a3c6bce594936ecf726459acfda0150d2efc6c