am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1

* commit '6e6d8df5d0ad0f97be8344c78aa4d70dadceb9a8':
  Adding camera zoom test to mediaframework stress suite.