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

Change-Id: I174447d01749d4f88b6aa2c1d1d950d6ecac5693