am 039cd7ff: Merge "MediaRecorderTest: test recording from persistent surface" into mnc-dev

* commit '039cd7ffaa28376fe00396b92dc77716bfa6e42e':
  MediaRecorderTest: test recording from persistent surface