Pass sampling or nothing to surface.draw

Test: make

Bug: 178700363
Change-Id: I144c0a1bc2376259640d1a6920d9df4edd652849
2 files changed