Upstream update from SQLCipher