Merge "healthd: Turn on -Werror"