Merge "Merge "Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9  -s ours" into nougat-cts-dev am: 9fe7f1c1f8" into nougat-mr1-cts-dev
am: d4abcc7c7d

Change-Id: I6341f7bf47a804bcd221fb2dc238bf22e7cf5963