[automerger skipped] Merge "Apply security patch to sqlite 3.18." into oc-dev...
[automerger skipped] Merge "Apply security patch to sqlite 3.18." into oc-dev am: 28c3d3b2 -s ours
am: 947639e0 -s ours
am skip reason: change_id Iad8c3d1d74d8591a75a4c033c8bf9d3956d2fe4f with SHA1 e86e209f is in history
Change-Id: I74ed3a70c14fbbf81c48746c2620a728f224e5ba