Merge "Enable Windows host compilation of scrypt" am: c09f61a395 am: 4c2a09a3c8 am: c9bce8a96a

Original change: https://android-review.googlesource.com/c/platform/external/scrypt/+/2414316

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