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

Change-Id: I9992c6eed0d712da3f15200fb565451c7e828571