Merge "Convert libsqlite_jni to Android.bp" am: 16ac73c020
am: c1d31b3f58

Change-Id: Ia8a5cc1649099fbc44c670e8fa9a20cd01d5e914