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