am d0f39dbb: Merge "Fix Harmony\'s HostnameVerifierTest breakage."

* commit 'd0f39dbb37a6c6d32b481067517daae95b360555':
  Fix Harmony's HostnameVerifierTest breakage.