Merge "Use -Werror in external/sqlite" am: 0d42d6b303
am: 545d8fbaaf

Change-Id: I39d7dc0fa3b764239dc5312d17a4f7df5df34659