Tweak setViewport stuff for fwd-compat

Change-Id: I532336eced54544115dfd47d5557cc77bafdfc87
2 files changed