Merge "Revert "Simplify our build file now we don't support non-neon."" am: 78d4e802

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



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