Merge "OatFileAssistant: look at vdex file for IsDexOptNeeded"