Merge "Check dexopt needed for secondary dex while downgrading"
am: 52fe6ff1d3

Change-Id: If91ad3e0a2557e84be6fa45d625f9c7703a57d32