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

Change-Id: I3e09d38c56180c618f41bb6e4753ba59c9c1113a