Add support for width != stride

BUG=6111812

Change-Id: Ie7e01613051160aa7071ea40431fe2eff1c8ab88
2 files changed