Merge "Use -Werror in hardware/libhardware/modules"