am a1b948af: am cbeb6e81: Merge "Include ping6 in all device builds"

* commit 'a1b948afdb5a46e168cf59ea4045b63722ee8b47':
  Include ping6 in all device builds