Merge "limit mediaextractor memory" into nyc-dev