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

Change-Id: Id7d9a6e99c3c502224fc09e7316cfb78484b013b