Merge "Remove ICU from mediaextractor binary"