Squashed 'src/leveldb/' changes from a31c8aa40..196962ff0