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

* commit 'e371ed8de54c42d2e0b8aa3fb7196670ff5ae9ee':