Fix Android N preview build on API 23#230

brody4hire wants to merge 2 commits intosqlcipher:android-n-previewsqlcipher/android-database-sqlcipher:android-n-previewfrom

brody4hire:cb-android-n-build-fixbrody4hire/android-database-sqlcipher:cb-android-n-build-fixCopy head branch name to clipboard