Merge "mm-video: 64 bit compilation fixes for test-app"