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