Merge "Remove unnecessary `neon:`." into main am: 2eee6f12bc Original change: https://android-review.googlesource.com/c/platform/external/scrypt/+/3047132 Change-Id: I8432ba24bc9b51c7c7855522d48e835c827a773e Signed-off-by: Automerger Merge Worker <[email protected]>