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

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

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



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