Merge "Fix package install flow w.r.t. dexopt"