Merge "remove pixelflinger from healthd"