Merge "Add libz to static libs of libutils_test" into main am: 8bc0ee30bf am: afe62313db

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2919586

Change-Id: Ie241efaa8b49439d11caaf63cbb04a12ffbab871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>