Merge "external/sqlite/android cleanup." am: d4c000d7ed am: c5d9748097
am: 7aa8f92192

Change-Id: I864b612991b7365ed5d49345016315f4de8c18af