Merge "Revert "OatFileAssistant: look at vdex file for IsDexOptNeeded""