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

* commit '4032217ee939d3b23548e83d9183306d66af6f8f':
  Add option for video playback test to accept media source path.