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

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