Merge "benchmarks: add 16 and 32 bytes to common sizes" am: f2549c8369 am: 787d012eac

Change-Id: If9dfca2992cafe48efef53a19245efa23125b5d8