Merge "gralloc: Return aligned w,h for UPDATE_BUFFER_GEOMETRY"