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

Change-Id: I4b085d22ae316b8308f9b4173c73fd55c1ed1c7f