Introduce independent hstride and vstride, and use them. am: bb7b551f97
am: b14e26a812

* commit 'b14e26a8122f37f9dd98c156e16af2f013011ed0':

Change-Id: I18b213027ef2d1094f6a891f55d29e9dbb3c3865