Android O MR1 Preview 2 (OPP6.171019.012)
Merge "external/scrypt: use proper nativehelper headers"
am: a1026771cc

Change-Id: Ic67ebd42bf2aa2ea81a52d013241baea333136aa