Derive HMAC secret from hashed password and salt

Change-Id: Ieaf52ae23fcd95d5ecb2b2acded22a4593741fb5