Merge "Clean up some unneeded non-neon support." am: da644317 am: 31b0fa9b am: ed21c570

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2278907



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