Android N Preview 4 (NPD56N)
Merge "scrypt doesn't need <machine/cpu-features.h>."