Merge "Use -Werror in system/core/healthd"