Merge "Use the new refined DexOptNeeded codes." am: d7e597a2e7
am: 99ae18486c

Change-Id: I4d6a7a5ad56ce0e6d91620fc63f05faad8348e78