Merge changes from topic "iputils-soong"
am: 7320a023ea

Change-Id: Iecac439885c0efd611051c4e9d123fad797f9fb2