[automerger skipped] Merge "[RESTRICT AUTOMERGE] Apply security patch to sqlite 3.18" into oc-dev am: 715dc1c018 am: 53b6567859 am: 673358d13e -s ours
am skip reason: subject contains skip directive

Change-Id: I90a30aa2bf6bd1f3cdc6fa78ff71e1e8aaed2b49
tree: d9f21379a0abc587d48cae6619f6b3d350cb70b7
  1. android/
  2. dist/
  3. Android.bp
  4. CleanSpec.mk
  5. OWNERS
  6. README.version