Merge "Scrypt: remove unused include"