Merge "Scrypt: remove unused include" am: 9737bb84c9 am: d95a0100c0 Change-Id: Id5d97e1a517c35799e1ba115745258116cef1963