Merge "Use -Werror in development/tools/etc1tool"