Merge "Fix installd_dexopt_test."
am: c684ad61dc

Change-Id: Ia6d03d6a880647c0ba2e6caf4aee5a7ce83b3eb1