Merge "Ensure that FVP binds to localhost." am: 998652923d am: ee95a15df7

Change-Id: I03f66623a6a6a792724c2f661d9b6fa002252e21