Merge "JankBench: Add Bitmap Upload to list of runnable tests" am: 9c4b6532b2 am: 1f90d94383
am: 0ed2ad08f9

Change-Id: Iaef1c7ffb34cd3b9a76a6eb10bc0db633c3f4e78