am 6be01bf2: Merge change Ifa1fae13 into eclair-mr2

Merge commit '6be01bf207077ffbdcd3879250171a26ec805835' into eclair-mr2-plus-aosp

* commit '6be01bf207077ffbdcd3879250171a26ec805835':
  Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."