Merge "Include ping6 in all device builds"