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

Change-Id: I7f6578d517a77dd24ab5dc785b7fdd0ab8fd5946