Merge "Installd: Fix installd_dexopt_test"