Merge "Modified camera framework stress tests." into qt-dev am: d6c8e026b9
am: d654ee2105

Change-Id: Ic71dc42b83b680581789b40c52fa0d7d635d3e86