Merge "Use Scrypt to hash long passwords in RecoverableKeyStore" into pi-dev
am: e73074e9a8

Change-Id: I50e3ee0083badc478dd9be5c647b351bfd2a840c