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

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



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