Merge "Installd: Fix installd_dexopt_test"
am: c75833b1d0

Change-Id: I90ccd16474d4e4d6bc7a93dcba16c6b83a803be4