Merge "Update tilebenchmark to work with current drawing infrastructure"