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