Merge "StreamingMediaPlayerTest: Moved assets to external storage"