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