Merge cherrypicks of [12196470, 12196437] into rvc-release

Change-Id: Id3eaf393b9aa384a9de4a326634848d359d5f93f
diff --git a/dist/Android.bp b/dist/Android.bp
index d4eb4b4..3bb9a10 100644
--- a/dist/Android.bp
+++ b/dist/Android.bp
@@ -38,6 +38,7 @@
         "-DSQLITE_SECURE_DELETE",
         "-DSQLITE_ENABLE_BATCH_ATOMIC_WRITE",
         "-DBIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD",
+        "-DSQLITE_DEFAULT_LEGACY_ALTER_TABLE",
         "-Wno-unused-parameter",
         "-Werror",