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

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



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