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

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

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



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