am 2b755c50: am d7c6d9dc: Merge "Add basic HTTP and RTSP streaming tests to CTS." into gingerbread

* commit '2b755c50129e08f1f8dbe996d9cd49189eb28bc2':
  Add basic HTTP and RTSP streaming tests to CTS.