Merge "MediaFrameworkTest: Fix camera unit test failure"