Merge "Enable sqlite trunk-stable flags in jni" into main