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

Change-Id: Ibe793b23b865883f46d3ad7e196ef90bc27f04a7