Merge "Fix installd_dexopt_test." am: c684ad61dc
am: cc20457c7b

Change-Id: I132894a725c98679b86700be18b51cddcc90dd7b