back out convertnosalt changes
back out convertnosalt changes

bestofsong/sqlcipher,bestofsong/sqlcipher,emodeqidao/sqlcipher,supriyantomaftuh/sqlcipher,RAN-II/sqlcipher,Mozhuowen/sqlcipher,luis-allan/sqlcipher,ylfonline/sqlcipher,shanshan1026/sqlcipher,cnbin/sqlcipher,bestofsong/sqlcipher,RAN-II/sqlcipher,emodeqidao/sqlcipher,shanshan1026/sqlcipher,pandazheng/sqlcipher,luis-allan/sqlcipher,supriyantomaftuh/sqlcipher,ylfonline/sqlcipher,shanshan1026/sqlcipher,luis-allan/sqlcipher,hongbinz/sqlcipher,emodeqidao/sqlcipher,cnbin/sqlcipher,supriyantomaftuh/sqlcipher,shanshan1026/sqlcipher,Mozhuowen/sqlcipher,pandazheng/sqlcipher,hongbinz/sqlcipher,ylfonline/sqlcipher,RAN-II/sqlcipher,cnbin/sqlcipher,pandazheng/sqlcipher,Mozhuowen/sqlcipher,hongbinz/sqlcipher