am 4032217e: Merge "Add option for video playback test to accept media source...
am 4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
* commit '4032217e':
Add option for video playback test to accept media source path.