Merge "Fix potential heap data leak in mediadrmserver" into nyc-mr1-dev