Merge "Fix potential heap data leak in mediadrmserver" into nyc-mr1-dev am: 824d20c999 am: 237f0d6a52
am: d0a73ca1a4

Change-Id: I422dbecdcc95b4a630a6208a94549631112d1e46