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

Change-Id: Ibed722c481448f9a9bd83e5d3fe2982eb439ffdb