[automerger skipped] Allow localhost HTTP URLs for the capport API am:...

[automerger skipped] Allow localhost HTTP URLs for the capport API am: 6bed0e59 -s ours am: 88743bc4 -s ours am: d1401b43 -s ours am: 21c6bead -s ours

am skip reason: Change-Id I5f2cdd02376785b152e5b9a6e798d797894ea45b with SHA-1 b6949332 is in history

Original change: undetermined

Change-Id: I13b38539725489853ef4538c5de964aa63bc7752