Merge commit '2055e21852261e5a4c8312b92bd7bbdcfa160472' of sso://googleplex-android/platform/external/sqlite into HEAD
Change-Id: Id13cf8a4b3728140a58c8b198ec24e3530cd9bd4