am 9d7e75eb: am bf964e6a: Merge change Ic060d86f into eclair

Merge commit '9d7e75eb0c774e36cbfbe71f37cedec6f1cc5331' into eclair-mr2-plus-aosp

* commit '9d7e75eb0c774e36cbfbe71f37cedec6f1cc5331':
  Check whether test server is up before running tests which use streaming files.