Merge "Removing extraconfig_map from vp9_cx_iface.c."