am 0a7a8526: am 50f311e5: Merge "Camera: another legacy video recording fix" into lollipop-cts-dev

* commit '0a7a8526464f191de0ad45f413318fa03627807b':
  Camera: another legacy video recording fix