Merge "media: Fix memory leak when recording duration exceeds duration limit." into nyc-mr1-dev am: b83d53a156
am: b39d520faa

Change-Id: I835247837892fbc95470f44bd1c414d5cfd2227a