Merge "Fix installd_dexopt_test."