Add support for stride != width.

BUG=6111812

Change-Id: I419dbf90f94ca54b4189fa6e62a2449efd893676
3 files changed