Android O IOT Preview 6 (4475743)
Merge "Use -Werror in external/javasqlite"
am: 097da4c057

Change-Id: I41ec482e36df2ab05b29770294d1bb1c4e5a40b8