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

* commit '137fba0db389b6f343e9f9d6f5e9f1268a768e15':