Merge "Revert "Update sqlite cflags"" am: 0a568fd586 am: d39faa7a94 am: e7c822c3f3

Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2016735

Change-Id: I0fd86459c9ffaf9ef12936daa9f1af8dccdf7253