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

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