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

* commit '4d3a3429d2dced2a93fa02054fb34d2107e0364a':