Merge "Installd: Fix installd_dexopt_test" am: c75833b1d0
am: 203201be03

Change-Id: If08ece327e3b4720915f7acbc3ca0831399fc590