Merge "Load *_compat_cil_file from system_ext as well"