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

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

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