Merge "Refine the DexOptNeeded codes."
am: 424c03aac2

Change-Id: Ib88c9fd41a43076f8fb1313411267d136e690858