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

Change-Id: I58fbb54b94350e633fdd38cfb984de87a1862fd2