Merge "Disable cdex for non background dexopt" am: 4f9ecc63cf
am: 756b441357

Change-Id: I869778acac04ebec02a990617440466fa2463d1e