Merge "Remove -Wno-pointer-bool-conversion"
am: de9339b298

Change-Id: Ie80ea68df89ba35d9234b61313048e966ac074fd