Merge "Update sqlite cflags"