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

* commit '032ad0542b395d1277b634b1243f36ae2100eb16':
  Include ping6 in all device builds