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

Change-Id: Iad8ab08d0e41a9ef6e373a9b2052f32b552c0ea7