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

* commit '9e88e82e9ba2938263212f63c5021a904740a690':
  Adding camera zoom test to mediaframework stress suite.