Merge pull request #273 from bhariharan/unstable20

Latest shared repo commit
Upgrade to the latest SQLCipher for Android (2.1.1)
Merge pull request #274 from bhariharan/sqlcipher_2_1_1

Upgrade to the latest SQLCipher for Android (2.1.1)
Fix for NPE