Revert "reuse SQL statements with different selection args"

This reverts commit 7cac580efadfcbfeedc15802a436f774f9d134ce, which
breaks the unit tests.

Change-Id: I3d9cb75992eaecbf7acc5fb01d3b8d7513f88d38
1 file changed