Merge "Fix assertion checks in libs/hwui/Mesh.cpp" into main