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

Change-Id: I1e4eede44395618dc5e25bbb388cd432850395d1