Merge "Simplify our build file now we don't support non-neon." am: 1ad4e24e

Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2266408



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