Merge "Use -Werror in art"
am: 3069f90c49

Change-Id: Ia123d1f69c37d59e6a0d93c8af09e3ec0d5b22ec