Merge "Expose the JNI scrypt function in a standalone Java class so we can use...
Merge "Expose the JNI scrypt function in a standalone Java class so we can use it in RecoverableKeyStore as well" into pi-dev am: 1364455f
am: d4cc3784
Change-Id: I9610319daa1a4cb728470283992c152d95926383