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

Change-Id: I550c7db43024ae74258f3bb7bea1ec67a8df04b7