Also switch throughput to GiB/s. I did play with using the new code, but having consistent units for all results seemed easier to use anyway (and doesn't require extra code). Change-Id: I466fd573373bd05619e6f6e6d3dedd7dae0d9362