Merge "Check dexopt needed for secondary dex while downgrading" am: 52fe6ff1d3 am: 8c478b90fb  -s ours
am: eeb2f804ba  -s ours

Change-Id: I83cbc3e0b641ca8006b828f21e5f8e958d509a96