Merge "Scrypt: remove unused include" am: 9737bb84c9 am: d95a0100c0
am: ee712e7ad6

Change-Id: Ied30aeb844a817f12bb22d333ba74a44e16b0279