Merge "Include ping6 in userdebug builds."