Merge "Upgrade zlib to 89921383f1f51331f48a2dc843403779770ea3a9 am: 6f8a05527f" into main-kernel