Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1