Merge tag 'test_omx_omap5' into cleanup