Merge "Reorder compatibility libraries used in class loader context."
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index 5bfe1a5..560a555 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -143,8 +143,8 @@
     org.apache.http.legacy
 
   my_dexpreopt_libs_compat_29 := \
-    android.hidl.base-V1.0-java \
-    android.hidl.manager-V1.0-java
+    android.hidl.manager-V1.0-java \
+    android.hidl.base-V1.0-java
 
   my_dexpreopt_libs_compat_30 := \
     android.test.base \