Fix potential heap data leak in mediadrmserver am: d36832a813 am: d983c8319a
am: 1621bbd891

Change-Id: I648ed2892f5d15220b6ab577b0416bda846377c9