Merge "Configure com.android.media APEX to prefer cfi variants"