Merge "Use -Werror in external/javasqlite" am: 097da4c057 am: 19c2f855c2
am: 82eb258571

Change-Id: I67407b5e7742b48c1029d04b88b4f9422b4e1f66