-Werror,-Wbool-conversion

Change-Id: Idd932fae23b313ea59f79a3159e9f4713e354b36