am c5c912e4: Merge change 20717 into donut

Merge commit 'c5c912e49bdc89a7a7778b66d1ca6b00440d2888'

* commit 'c5c912e49bdc89a7a7778b66d1ca6b00440d2888':
  Release the camera in surfaceDestroyed().