Merge "external/scrypt: use proper nativehelper headers"