Merge "Fix libcore.java.sql.OldPreparedStatementTest#testExecuteQuery"