Merge "Remove obsolete `neon:` clause." into main am: 30fe7300b3 am: 63a073f6ce

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3017358

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