am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2

* commit 'd148a499c27145e0473f89ece0500ebed38f875f':
  Using widevine:// to stream adaptive bitrate wvm content no longer