Merge "Use -Werror in development/tools/etc1tool"
am: 0fb565459f

Change-Id: I71754190fc5d738c4cdd0302bb6a534439a85163