am c8abe0f6: am 2f181a15: Merge "Fix testVideoSurfaceResetting for Landscape" into ics-mr1

* commit 'c8abe0f653e6f1e14fc9d9fd888af4b8c5cf2860':
  Fix testVideoSurfaceResetting for Landscape