Merge "Disable failing InetAddressUtilsTest tests only in host" am: e29b950562
am: 641defe48f

Change-Id: Iafef54aa47e5379770552bd0534f01ba63622b89