Merge "gralloc: Align NV21 to 32 pixels"