Merge "Update paths to test content used to run the omx_tests."