am ad94a470: am ffb39e26: Merge "Camera: fix video snapshot test" into lollipop-mr1-cts-dev

* commit 'ad94a470e7deb0ea257a988e53f1b53aef4eb0e1':
  Camera: fix video snapshot test