Merge "Load *_compat_cil_file from system_ext as well" am: 3841fdfa3c am: 6e944a9484

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1650271

Change-Id: Ibe73d8e2862ce8bd75db09bef1a9bb0d9073ec24