Include ping6 in userdebug builds.

Also require that the user be root or have Internet
permission, like we do for IPv4.

Change-Id: I8ab8350885548ab83d5198adee912137b36d7a8d
Merge "Include ping6 in userdebug builds."
Merge branch 'jb43-aosp' into HEAD

Conflicts:
	Android.mk

Change-Id: I772a0b47f6d8d3fd36608f842a2b478e3ff0496a