Fix potential tree conflicts with scrypt

Change-Id: Iac40957e40cb9c10795dd6a1f67ca902c95dd9bc