Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  sqlite: upgrade to SQLite 3.8.6.1 - DO NOT MERGE

Change-Id: I5c15e1734678a4a17e6e6d1c177b1c19c802e366