Merge "gralloc: Fix NV12 and NV21 stride"