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

Change-Id: I38569e571440614cd5dea69135a2fd5660ba145a