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

Change-Id: I84720e1e41c70cf3176e59d5a6457fbd64a20578