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

Change-Id: I464aefaf07a964046a8d10870d78f45f6769df30