Merge "Add memory leak detection to mediaserver" into nyc-dev