Merge commit '2ea3148c' into eclair-plus-aosp * commit '2ea3148c': remove usage of poison_patch from sqlite.