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

Change-Id: Ic714757588429fb0ef97b6c1967e1768a773e847